From 51b36511e307313a879a8e28e4288b64828d5f8f Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Wed, 25 Mar 2009 19:02:31 +0000 Subject: [PATCH] Some vendor compilers can't compile non-constant elements of compound struct initializers Patch from Gary V. Vaughan svn path=/trunk/; revision=399 --- ChangeLog | 6 ++++++ babl/babl-fish.c | 10 ++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d144a39..7aae42c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-03-25 Martin Nordholts + + * babl/babl-fish.c: Patch from Gary V. Vaughan. Some vendor + compilers can't compile non-constant elements of compound struct + initializers + 2009-03-25 Martin Nordholts Patch from Gary V. Vaughan. Some vendor C compilers choke on C++ diff --git a/babl/babl-fish.c b/babl/babl-fish.c index c446e36..0ab048c 100644 --- a/babl/babl-fish.c +++ b/babl/babl-fish.c @@ -193,8 +193,14 @@ babl_fish (const void *source, (Babl *) NULL, (Babl *) NULL, 0, - source_format, - destination_format}; + (Babl *) NULL, + (Babl *) NULL}; + + /* some vendor compilers can't compile non-constant elements of + * compound struct initializers + */ + ffish.source = source_format; + ffish.destination = destination_format; id_htable = (babl_fish_db ())->id_hash; hashval = babl_hash_by_int (id_htable, babl_fish_get_id (source_format, destination_format)); -- 2.30.2